Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: sync changes from v2 to alpha (🚨 CONFLICTS RESOLVED) #162

Merged
merged 1 commit into from
Dec 16, 2024

Conversation

giscegit
Copy link
Contributor

This PR syncs changes from the v2 branch to alpha.

🚨 BE CAREFUL BEFORE MERGING

There were conflicts that were automatically resolved using changes from base branch.

@mguellsegarra mguellsegarra merged commit 289f815 into alpha Dec 16, 2024
1 check passed
@mguellsegarra mguellsegarra deleted the sync/v2-to-alpha-20241213-130127 branch December 16, 2024 07:47
github-actions bot pushed a commit that referenced this pull request Dec 24, 2024
# [2.26.0-alpha.2](v2.26.0-alpha.1...v2.26.0-alpha.2) (2024-12-24)

### Features

* **colorPicker:** add new component colorPicker ([01fe659](01fe659))
* sync changes from v2 to alpha ([#162](#162)) [skip ci] ([289f815](289f815))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants